Autogenerated HTML docs for v1.7.0.1-138-ga75b
diff --git a/diff-options.txt b/diff-options.txt index 8707d0e..60e922e 100644 --- a/diff-options.txt +++ b/diff-options.txt
@@ -117,12 +117,14 @@ option and lists the commits in that commit range like the 'summary' option of linkgit:git-submodule[1] does. ---color:: +--color[=<when>]:: Show colored diff. + The value must be always (the default), never, or auto. --no-color:: Turn off colored diff, even when the configuration file gives the default to color output. + Same as `--color=never`. --color-words[=<regex>]:: Show colored word diff, i.e., color words which have changed.
diff --git a/git-branch.html b/git-branch.html index 23605a1..f4bcccf 100644 --- a/git-branch.html +++ b/git-branch.html
@@ -321,7 +321,7 @@ <h2>SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="content"><em>git branch</em> [--color | --no-color] [-r | -a] +<div class="content"><em>git branch</em> [--color[=<when>] | --no-color] [-r | -a] [-v [--abbrev=<length> | --no-abbrev]] [(--merged | --no-merged | --contains) [<commit>]] <em>git branch</em> [--set-upstream | --track | --no-track] [-l] [-f] <branchname> [<start-point>] @@ -422,11 +422,12 @@ </p> </dd> <dt> ---color +--color[=<when>] </dt> <dd> <p> Color branches to highlight current, local, and remote branches. + The value must be always (the default), never, or auto. </p> </dd> <dt> @@ -436,6 +437,7 @@ <p> Turn off branch colors, even when the configuration file gives the default to color output. + Same as <tt>--color=never</tt>. </p> </dd> <dt> @@ -694,7 +696,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-02-13 00:59:35 UTC +Last updated 2010-03-03 05:12:39 UTC </div> </div> </body>
diff --git a/git-branch.txt b/git-branch.txt index 6b6c3da..903a690 100644 --- a/git-branch.txt +++ b/git-branch.txt
@@ -8,7 +8,7 @@ SYNOPSIS -------- [verse] -'git branch' [--color | --no-color] [-r | -a] +'git branch' [--color[=<when>] | --no-color] [-r | -a] [-v [--abbrev=<length> | --no-abbrev]] [(--merged | --no-merged | --contains) [<commit>]] 'git branch' [--set-upstream | --track | --no-track] [-l] [-f] <branchname> [<start-point>] @@ -84,12 +84,14 @@ -M:: Move/rename a branch even if the new branch name already exists. ---color:: +--color[=<when>]:: Color branches to highlight current, local, and remote branches. + The value must be always (the default), never, or auto. --no-color:: Turn off branch colors, even when the configuration file gives the default to color output. + Same as `--color=never`. -r:: List or delete (if used with -d) the remote-tracking branches.
diff --git a/git-cvsimport.html b/git-cvsimport.html index 0116c64..b7e72b9 100644 --- a/git-cvsimport.html +++ b/git-cvsimport.html
@@ -325,7 +325,7 @@ [-A <author-conv-file>] [-p <options-for-cvsps>] [-P <file>] [-C <git_repository>] [-z <fuzz>] [-i] [-k] [-u] [-s <subst>] [-a] [-m] [-M <regex>] [-S <regex>] [-L <commitlimit>] - [-r <remote>] [<CVS_module>]</div></div> + [-r <remote>] [-R] [<CVS_module>]</div></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> @@ -553,6 +553,25 @@ <em>git cvsexportcommit</em>.</p></div> </dd> <dt> +-R +</dt> +<dd> +<p> + Generate a <tt>$GIT_DIR/cvs-revisions</tt> file containing a mapping from CVS + revision numbers to newly-created Git commit IDs. The generated file + will contain one line for each (filename, revision) pair imported; + each line will look like +</p> +<div class="listingblock"> +<div class="content"> +<pre><tt>src/widget.c 1.1 1d862f173cdc7325b6fa6d2ae1cfd61fd1b512b7</tt></pre> +</div></div> +<div class="para"><p>The revision data is appended to the file if it already exists, for use when +doing incremental imports.</p></div> +<div class="para"><p>This option may be useful if you have CVS revision numbers stored in commit +messages, bug-tracking systems, email archives, and the like.</p></div> +</dd> +<dt> -h </dt> <dd> @@ -653,7 +672,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-02-13 00:59:38 UTC +Last updated 2010-03-03 05:12:39 UTC </div> </div> </body>
diff --git a/git-cvsimport.txt b/git-cvsimport.txt index ddfcb3d..8bcd875 100644 --- a/git-cvsimport.txt +++ b/git-cvsimport.txt
@@ -13,7 +13,7 @@ [-A <author-conv-file>] [-p <options-for-cvsps>] [-P <file>] [-C <git_repository>] [-z <fuzz>] [-i] [-k] [-u] [-s <subst>] [-a] [-m] [-M <regex>] [-S <regex>] [-L <commitlimit>] - [-r <remote>] [<CVS_module>] + [-r <remote>] [-R] [<CVS_module>] DESCRIPTION @@ -157,6 +157,22 @@ export changes back to CVS again later with 'git cvsexportcommit'. +-R:: + Generate a `$GIT_DIR/cvs-revisions` file containing a mapping from CVS + revision numbers to newly-created Git commit IDs. The generated file + will contain one line for each (filename, revision) pair imported; + each line will look like ++ +--------- +src/widget.c 1.1 1d862f173cdc7325b6fa6d2ae1cfd61fd1b512b7 +--------- ++ +The revision data is appended to the file if it already exists, for use when +doing incremental imports. ++ +This option may be useful if you have CVS revision numbers stored in commit +messages, bug-tracking systems, email archives, and the like. + -h:: Print a short usage message and exit.
diff --git a/git-diff-files.html b/git-diff-files.html index f50cf04..40b7e0e 100644 --- a/git-diff-files.html +++ b/git-diff-files.html
@@ -495,11 +495,12 @@ </p> </dd> <dt> ---color +--color[=<when>] </dt> <dd> <p> Show colored diff. + The value must be always (the default), never, or auto. </p> </dd> <dt> @@ -509,6 +510,7 @@ <p> Turn off colored diff, even when the configuration file gives the default to color output. + Same as <tt>--color=never</tt>. </p> </dd> <dt> @@ -1428,7 +1430,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-02-13 00:59:40 UTC +Last updated 2010-03-03 05:12:39 UTC </div> </div> </body>
diff --git a/git-diff-index.html b/git-diff-index.html index a89d10a..da5acec 100644 --- a/git-diff-index.html +++ b/git-diff-index.html
@@ -496,11 +496,12 @@ </p> </dd> <dt> ---color +--color[=<when>] </dt> <dd> <p> Show colored diff. + The value must be always (the default), never, or auto. </p> </dd> <dt> @@ -510,6 +511,7 @@ <p> Turn off colored diff, even when the configuration file gives the default to color output. + Same as <tt>--color=never</tt>. </p> </dd> <dt> @@ -1506,7 +1508,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-02-13 00:59:40 UTC +Last updated 2010-03-03 05:12:39 UTC </div> </div> </body>
diff --git a/git-diff-tree.html b/git-diff-tree.html index 9631a8b..de6397f 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html
@@ -498,11 +498,12 @@ </p> </dd> <dt> ---color +--color[=<when>] </dt> <dd> <p> Show colored diff. + The value must be always (the default), never, or auto. </p> </dd> <dt> @@ -512,6 +513,7 @@ <p> Turn off colored diff, even when the configuration file gives the default to color output. + Same as <tt>--color=never</tt>. </p> </dd> <dt> @@ -2053,7 +2055,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-02-13 00:59:41 UTC +Last updated 2010-03-03 05:12:40 UTC </div> </div> </body>
diff --git a/git-diff.html b/git-diff.html index da815e4..1be6239 100644 --- a/git-diff.html +++ b/git-diff.html
@@ -575,11 +575,12 @@ </p> </dd> <dt> ---color +--color[=<when>] </dt> <dd> <p> Show colored diff. + The value must be always (the default), never, or auto. </p> </dd> <dt> @@ -589,6 +590,7 @@ <p> Turn off colored diff, even when the configuration file gives the default to color output. + Same as <tt>--color=never</tt>. </p> </dd> <dt> @@ -1635,7 +1637,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-02-13 00:59:41 UTC +Last updated 2010-03-03 05:12:40 UTC </div> </div> </body>
diff --git a/git-format-patch.html b/git-format-patch.html index 1d0f8c9..6f45346 100644 --- a/git-format-patch.html +++ b/git-format-patch.html
@@ -1026,7 +1026,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-02-13 00:59:44 UTC +Last updated 2010-03-03 05:12:41 UTC </div> </div> </body>
diff --git a/git-grep.html b/git-grep.html index b211162..624aaf6 100644 --- a/git-grep.html +++ b/git-grep.html
@@ -330,7 +330,7 @@ [-z | --null] [-c | --count] [--all-match] [-q | --quiet] [--max-depth <depth>] - [--color | --no-color] + [--color[=<when>] | --no-color] [-A <post-context>] [-B <pre-context>] [-C <context>] [-f <file>] [-e] <pattern> [--and|--or|--not|(|)|-e <pattern>…] [<tree>…] @@ -529,11 +529,12 @@ </p> </dd> <dt> ---color +--color[=<when>] </dt> <dd> <p> Show colored matches. + The value must be always (the default), never, or auto. </p> </dd> <dt> @@ -543,6 +544,7 @@ <p> Turn off match highlighting, even when the configuration file gives the default to color output. + Same as <tt>--color=never</tt>. </p> </dd> <dt> @@ -715,7 +717,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-02-22 00:13:12 UTC +Last updated 2010-03-03 05:12:41 UTC </div> </div> </body>
diff --git a/git-grep.txt b/git-grep.txt index c44724d..6305f6d 100644 --- a/git-grep.txt +++ b/git-grep.txt
@@ -18,7 +18,7 @@ [-z | --null] [-c | --count] [--all-match] [-q | --quiet] [--max-depth <depth>] - [--color | --no-color] + [--color[=<when>] | --no-color] [-A <post-context>] [-B <pre-context>] [-C <context>] [-f <file>] [-e] <pattern> [--and|--or|--not|(|)|-e <pattern>...] [<tree>...] @@ -111,12 +111,14 @@ Instead of showing every matched line, show the number of lines that match. ---color:: +--color[=<when>]:: Show colored matches. + The value must be always (the default), never, or auto. --no-color:: Turn off match highlighting, even when the configuration file gives the default to color output. + Same as `--color=never`. -[ABC] <context>:: Show `context` trailing (`A` -- after), or leading (`B`
diff --git a/git-imap-send.html b/git-imap-send.html index c1de6c2..e24e3ea 100644 --- a/git-imap-send.html +++ b/git-imap-send.html
@@ -416,6 +416,15 @@ format=fixed email. Default is <tt>false</tt>. </p> </dd> +<dt> +imap.authMethod +</dt> +<dd> +<p> + Specify authenticate method for authentication with IMAP server. + Current supported method is <em>CRAM-MD5</em> only. +</p> +</dd> </dl></div> <h3 id="_examples">Examples</h3><div style="clear:left"></div> <div class="para"><p>Using tunnel mode:</p></div> @@ -476,7 +485,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-02-13 00:59:45 UTC +Last updated 2010-03-03 05:12:42 UTC </div> </div> </body>
diff --git a/git-imap-send.txt b/git-imap-send.txt index 57db955..6cafbe2 100644 --- a/git-imap-send.txt +++ b/git-imap-send.txt
@@ -71,6 +71,10 @@ option causes Thunderbird to send the patch as a plain/text, format=fixed email. Default is `false`. +imap.authMethod:: + Specify authenticate method for authentication with IMAP server. + Current supported method is 'CRAM-MD5' only. + Examples ~~~~~~~~
diff --git a/git-log.html b/git-log.html index 3bbbd2c..8ea5299 100644 --- a/git-log.html +++ b/git-log.html
@@ -497,11 +497,12 @@ </p> </dd> <dt> ---color +--color[=<when>] </dt> <dd> <p> Show colored diff. + The value must be always (the default), never, or auto. </p> </dd> <dt> @@ -511,6 +512,7 @@ <p> Turn off colored diff, even when the configuration file gives the default to color output. + Same as <tt>--color=never</tt>. </p> </dd> <dt> @@ -2566,7 +2568,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-02-19 09:57:44 UTC +Last updated 2010-03-03 05:12:42 UTC </div> </div> </body>
diff --git a/git-show-branch.html b/git-show-branch.html index 018d736..4580dc3 100644 --- a/git-show-branch.html +++ b/git-show-branch.html
@@ -322,7 +322,7 @@ <div class="sectionbody"> <div class="verseblock"> <div class="content"><em>git show-branch</em> [-a|--all] [-r|--remotes] [--topo-order | --date-order] - [--current] [--color | --no-color] [--sparse] + [--current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] [<rev> | <glob>]…</div></div> @@ -513,12 +513,13 @@ </p> </dd> <dt> ---color +--color[=<when>] </dt> <dd> <p> Color the status sign (one of these: <tt>*</tt> <tt>!</tt> <tt>+</tt> <tt>-</tt>) of each commit corresponding to the branch it's in. + The value must be always (the default), never, or auto. </p> </dd> <dt> @@ -528,6 +529,7 @@ <p> Turn off colored output, even when the configuration file gives the default to color output. + Same as <tt>--color=never</tt>. </p> </dd> </dl></div> @@ -610,7 +612,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-02-19 09:57:47 UTC +Last updated 2010-03-03 05:12:42 UTC </div> </div> </body>
diff --git a/git-show-branch.txt b/git-show-branch.txt index b9c4154..f1499bb 100644 --- a/git-show-branch.txt +++ b/git-show-branch.txt
@@ -9,7 +9,7 @@ -------- [verse] 'git show-branch' [-a|--all] [-r|--remotes] [--topo-order | --date-order] - [--current] [--color | --no-color] [--sparse] + [--current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] [<rev> | <glob>]... @@ -117,13 +117,15 @@ When no explicit <ref> parameter is given, it defaults to the current branch (or `HEAD` if it is detached). ---color:: +--color[=<when>]:: Color the status sign (one of these: `*` `!` `+` `-`) of each commit corresponding to the branch it's in. + The value must be always (the default), never, or auto. --no-color:: Turn off colored output, even when the configuration file gives the default to color output. + Same as `--color=never`. Note that --more, --list, --independent and --merge-base options are mutually exclusive.
diff --git a/git-var.html b/git-var.html index a7ed9dd..1b56d72 100644 --- a/git-var.html +++ b/git-var.html
@@ -320,7 +320,7 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git var</em> [ -l | <variable> ]</p></div> +<div class="para"><p><em>git var</em> ( -l | <variable> )</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> @@ -444,7 +444,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-02-13 01:00:00 UTC +Last updated 2010-03-03 05:12:42 UTC </div> </div> </body>
diff --git a/git-var.txt b/git-var.txt index bb98182..458f3e2 100644 --- a/git-var.txt +++ b/git-var.txt
@@ -8,7 +8,7 @@ SYNOPSIS -------- -'git var' [ -l | <variable> ] +'git var' ( -l | <variable> ) DESCRIPTION -----------
diff --git a/git.html b/git.html index 396d72c..951e7b2 100644 --- a/git.html +++ b/git.html
@@ -397,7 +397,10 @@ </dt> <dd> <p> - Pipe all output into <em>less</em> (or if set, $PAGER). + Pipe all output into <em>less</em> (or if set, $PAGER) if standard + output is a terminal. This overrides the <tt>pager.<cmd></tt> + configuration options (see the "Configuration Mechanism" section + below). </p> </dd> <dt> @@ -1614,7 +1617,8 @@ </tt></pre> </div></div> <div class="para"><p>Various commands read from the configuration file and adjust -their operation accordingly.</p></div> +their operation accordingly. See <a href="git-config.html">git-config(1)</a> for a +list.</p></div> </div> <h2 id="_identifier_terminology">Identifier Terminology</h2> <div class="sectionbody"> @@ -2077,7 +2081,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-02-28 23:13:16 UTC +Last updated 2010-03-03 05:12:42 UTC </div> </div> </body>
diff --git a/git.txt b/git.txt index cc32ce1..98b6e16 100644 --- a/git.txt +++ b/git.txt
@@ -230,7 +230,10 @@ -p:: --paginate:: - Pipe all output into 'less' (or if set, $PAGER). + Pipe all output into 'less' (or if set, $PAGER) if standard + output is a terminal. This overrides the `pager.<cmd>` + configuration options (see the "Configuration Mechanism" section + below). --no-pager:: Do not pipe git output into a pager. @@ -402,7 +405,8 @@ ------------ Various commands read from the configuration file and adjust -their operation accordingly. +their operation accordingly. See linkgit:git-config[1] for a +list. Identifier Terminology
diff --git a/technical/api-parse-options.html b/technical/api-parse-options.html index 0a5045a..342e109 100644 --- a/technical/api-parse-options.html +++ b/technical/api-parse-options.html
@@ -497,6 +497,14 @@ </p> </dd> <dt> +<tt>OPT__COLOR(&int_var, description)</tt> +</dt> +<dd> +<p> + Add <tt>--color[=<when>]</tt> and <tt>—no-color</tt>. +</p> +</dd> +<dt> <tt>OPT__DRY_RUN(&int_var)</tt> </dt> <dd> @@ -644,6 +652,20 @@ precedence over it. </p> </dd> +<dt> +<tt>OPT_COLOR_FLAG(short, long, &int_var, description)</tt> +</dt> +<dd> +<p> + Introduce an option that takes an optional argument that can + have one of three values: "always", "never", or "auto". If the + argument is not given, it defaults to "always". The <tt>—no-</tt> form + works like <tt>—long=never</tt>; it cannot take an argument. If + "always", set <tt>int_var</tt> to 1; if "never", set <tt>int_var</tt> to 0; if + "auto", set <tt>int_var</tt> to 1 if stdout is a tty or a pager, + 0 otherwise. +</p> +</dd> </dl></div> <div class="para"><p>The last element of the array must be <tt>OPT_END()</tt>.</p></div> <div class="para"><p>If not stated otherwise, interpret the arguments as follows:</p></div> @@ -740,7 +762,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-02-13 01:00:10 UTC +Last updated 2010-03-03 05:12:43 UTC </div> </div> </body>
diff --git a/technical/api-parse-options.txt b/technical/api-parse-options.txt index 50f9e9a..312e3b2 100644 --- a/technical/api-parse-options.txt +++ b/technical/api-parse-options.txt
@@ -115,6 +115,9 @@ `OPT__ABBREV(&int_var)`:: Add `\--abbrev[=<n>]`. +`OPT__COLOR(&int_var, description)`:: + Add `\--color[=<when>]` and `--no-color`. + `OPT__DRY_RUN(&int_var)`:: Add `-n, \--dry-run`. @@ -183,6 +186,15 @@ arguments. Short options that happen to be digits take precedence over it. +`OPT_COLOR_FLAG(short, long, &int_var, description)`:: + Introduce an option that takes an optional argument that can + have one of three values: "always", "never", or "auto". If the + argument is not given, it defaults to "always". The `--no-` form + works like `--long=never`; it cannot take an argument. If + "always", set `int_var` to 1; if "never", set `int_var` to 0; if + "auto", set `int_var` to 1 if stdout is a tty or a pager, + 0 otherwise. + The last element of the array must be `OPT_END()`.
